317. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:19 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

317.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Smartwave_Porto/templates/htmlhead.phtml2021-06-11 00:46:44 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Smartwave_Porto/templates/htmlhead.phtml2023-03-07 09:26:54 +0000

317.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged4290
Changed26
Inserted117
Removed00

317.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

317.4 Active regular expressions

No regular expressions were active.

317.5 Comparison detail

1 <?php 1 <?php
2     $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig'); 2     $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig');
3     $porto_helper = $this->helper('Smartwave\Porto\Helper\Data'); 3     $porto_helper = $this->helper('Smartwave\Porto\Helper\Data');
4     $_redirect_cart = $porto_helper->getConfig('checkout/cart/redirect_to_cart'); 4     $_redirect_cart = $porto_helper->getConfig('checkout/cart/redirect_to_cart');
5 ?> 5 ?>
6 <?php //Include Google fonts character subsets (such as extended latin, cyrillic) 6 <?php //Include Google fonts character subsets (such as extended latin, cyrillic)
7     $d = $this->getConfig('porto_design'); 7     $d = $this->getConfig('porto_design');
8     $charSubset = ""; 8     $charSubset = "";
9     if (isset($d['font']['char_latin_ext']) && $d['font']['char_latin_ext']==1 ) 9     if (isset($d['font']['char_latin_ext']) && $d['font']['char_latin_ext']==1 )
10         $charSubset .= ',latin-ext'; 10         $charSubset .= ',latin-ext';
11     if (isset($d['font']['char_subset']) && $d['font']['char_subset']) 11     if (isset($d['font']['char_subset']) && $d['font']['char_subset'])
12         $charSubset .= ','.$d['font']['char_subset']; 12         $charSubset .= ','.$d['font']['char_subset'];
13     $font_sizes = "%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic"; 13     $font_sizes = "%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic";
14 ?> 14 ?>
15 <?php if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'): ?> 15 <?php if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'): ?>
16 <link rel="stylesheet" href='//fonts.googleapis.com/css?family=<?php echo str_replace(' ', '+', $d['font']['google_font_family']).$font_sizes; echo $charSubset; ?>' type='text/css' /> 16 <link rel="stylesheet" href='//fonts.googleapis.com/css?family=<?php echo str_replace(' ', '+', $d['font']['google_font_family']).$font_sizes; echo $charSubset; ?>' type='text/css' />
17 <?php else: ?> 17 <?php else: ?>
18 <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&amp;v1&amp;subset=latin%2Clatin-ext" type="text/css" media="screen"/> 18 <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&amp;v1&amp;subset=latin%2Clatin-ext" type="text/css" media="screen"/>
19 <?php endif;?> 19 <?php endif;?>
20 <link href="https://fonts.googleapis.com/css?family=Oswald:300,400,500,600,700" rel="stylesheet"> 20 <link href="https://fonts.googleapis.com/css?family=Oswald:300,400,500,600,700" rel="stylesheet">
21 <link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,500,600,700,800" rel="stylesheet"> 21 <link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,500,600,700,800" rel="stylesheet">
22 <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?> 22 <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?>
23     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.rtl.min.css'; ?>"> 23     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.rtl.min.css'; ?>">
24 <?php else: ?> 24 <?php else: ?>
25     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.rtl.optimized.min.css'; ?>"> 25     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.rtl.optimized.min.css'; ?>">
26 <?php endif; ?> 26 <?php endif; ?>
27 <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?> 27 <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?>
28     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.css'; ?>"> 28     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.css'; ?>">
29 <?php else: ?> 29 <?php else: ?>
30     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.optimized.css'; ?>"> 30     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.optimized.css'; ?>">
31 <?php endif; ?> 31 <?php endif; ?>
32 <?php 32 <?php
33     $header_type = $this->getConfig('porto_settings/header/header_type'); 33     $header_type = $this->getConfig('porto_settings/header/header_type');
34 ?> 34 ?>
35 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/header/type'.$header_type.'.rtl.css'; ?>"> 35 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/header/type'.$header_type.'.rtl.css'; ?>">
36 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/custom.rtl.css'; ?>"> 36 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/custom.rtl.css'; ?>">
37 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getDesignFile()?>"> 37 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getDesignFile()?>">
38 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getSettingsFile()?>"> 38 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getSettingsFile()?>">
39 <script type="text/javascript"> 39 <script type="text/javascript">
40 var redirect_cart = false; 40 var redirect_cart = false;
41 <?php if($_redirect_cart):?> 41 <?php if($_redirect_cart):?>
42     redirect_cart = true; 42     redirect_cart = true;
43 <?php endif;?> 43 <?php endif;?>
44 var porto_config = { 44 var porto_config = {
45     paths: { 45     paths: {
46         'parallax': 'js/jquery.parallax.min', 46         'parallax': 'js/jquery.parallax.min',
47         'owlcarousel': 'owl.carousel/owl.carousel', 47         'owlcarousel': 'owl.carousel/owl.carousel',
48         'floatelement': 'js/jquery.floatelement' 48         'floatelement': 'js/jquery.floatelement'
49     }, 49     },
50     shim: { 50     shim: {
51         'owlcarousel': { 51         'owlcarousel': {
52           deps: ['jquery'] 52           deps: ['jquery']
53         }, 53         },
54         'owlcarousel_thumbs': { 54         'owlcarousel_thumbs': {
55           deps: ['jquery','owlcarousel'] 55           deps: ['jquery','owlcarousel']
56         }, 56         },
57         'floatelement': { 57         'floatelement': {
58           deps: ['jquery'] 58           deps: ['jquery']
59         } 59         }
60     } 60     }
61 }; 61 };
62  62 
63 require.config(porto_config); 63 require.config(porto_config);
64 </script> 64 </script>
65 <script type="text/javascript"> 65 <script type="text/javascript">
66 require([ 66 require([
67     'jquery'
 67     'jquery',
    68     'pt_animate'
68 ], function ($) { 69 ], function ($) {
    70   var $wrap = $(document.body);
    71   if ($.isFunction($.fn.themeAnimate)) {
    72     $wrap.find('[data-plugin-animate], [data-appear-animation]').each(function() {
    73       var $this = $(this),
    74           opts;
    75 
    76       var pluginOptions = $this.data('plugin-options');
    77       if (pluginOptions) {
    78         if (typeof pluginOptions == 'string') {
    79           opts = JSON.parse(pluginOptions.replace(/'/g,'"').replace(';',''));
    80         } else {
    81           opts = pluginOptions;
    82         }
    83       }
    84       $this.themeAnimate(opts);
    85     });
    86   }
69 <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?> 87 <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?>
70     var scrolled = false; 88     var scrolled = false;
71     $(window).scroll(function(){ 89     $(window).scroll(function(){
72         if($(window).width()>=992){ 90         if($(window).width()>=992){
73           if(140<$(window).scrollTop() && !scrolled){ 91           if(140<$(window).scrollTop() && !scrolled){
74               $('.page-header').addClass("sticky-header");
 92               $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px');
    93               $('.page-header').addClass("sticky-header"); 
75               scrolled = true; 94               scrolled = true;
76               if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { 95               if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) {
77                 $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>'); 96                 $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>');
78                 var minicart = $('.page-header .minicart-wrapper').detach(); 97                 var minicart = $('.page-header .minicart-wrapper').detach();
79                 $('.page-header .navigation').append(minicart); 98                 $('.page-header .navigation').append(minicart);
80  99 
81                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 100                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
82                 var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html(); 101                 var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html();
83                 $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>'); 102                 $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>');
84                 <?php endif; ?> 103                 <?php endif; ?>
85               } 104               }
86               <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 105               <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
87               <?php 106               <?php
88               if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){ 107               if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){
89                   $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR; 108                   $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR;
90                   $path = $folderName . '/' . $logo_src; 109                   $path = $folderName . '/' . $logo_src;
91                   $imageUrl = $porto_helper->getBaseUrl() . $path; 110                   $imageUrl = $porto_helper->getBaseUrl() . $path;
92               ?> 111               ?>
93               $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>"); 112               $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>");
94               <?php 113               <?php
95               } 114               }
96               ?> 115               ?>
97               <?php endif; ?> 116               <?php endif; ?>
98           } 117           }
99           if(140>=$(window).scrollTop() && scrolled){ 118           if(140>=$(window).scrollTop() && scrolled){
100               $('.page-header').removeClass("sticky-header"); 119               $('.page-header').removeClass("sticky-header");
101               scrolled = false; 120               scrolled = false;
102               if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { 121               if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) {
103                 var minicart; 122                 var minicart;
104                 minicart = $('.page-header .navigation .minicart-wrapper').detach(); 123                 minicart = $('.page-header .navigation .minicart-wrapper').detach();
105                 $('.minicart-place').after(minicart); 124                 $('.minicart-place').after(minicart);
106                 $('.minicart-place').remove(); 125                 $('.minicart-place').remove();
107                 $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); 126                 $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide");
108  127 
109                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 128                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
110                   $('.page-header .navigation > .sticky-logo').remove(); 129                   $('.page-header .navigation > .sticky-logo').remove();
111                 <?php endif; ?> 130                 <?php endif; ?>
112               } 131               }
113           } 132           }
114       } 133       }
115         if($('body').hasClass('mobile-sticky')) { 134         if($('body').hasClass('mobile-sticky')) {
116             if($(window).width()<=991){ 135             if($(window).width()<=991){
117                 if(130<$(window).scrollTop() && !scrolled){ 136                 if(130<$(window).scrollTop() && !scrolled){
118                   $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); 137                   $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px');
119                   $('.page-header').addClass("sticky-header"); 138                   $('.page-header').addClass("sticky-header");
120                   scrolled = true; 139                   scrolled = true;
121                 } 140                 }
122                 if(130>=$(window).scrollTop() && scrolled){ 141                 if(130>=$(window).scrollTop() && scrolled){
123                   $('.page-header.sticky-header').css("height",'auto'); 142                   $('.page-header.sticky-header').css("height",'auto');
124                   $('.page-header').removeClass("sticky-header"); 143                   $('.page-header').removeClass("sticky-header");
125                   scrolled = false; 144                   scrolled = false;
126                 } 145                 }
127             } 146             }
128         } 147         }
129         $(window).resize(function(){ 148         $(window).resize(function(){
130           var b_w = $(window).width(); 149           var b_w = $(window).width();
131           if(b_w <= 991){ 150           if(b_w <= 991){
132             if($('.page-header .navigation .minicart-wrapper').length > 0) { 151             if($('.page-header .navigation .minicart-wrapper').length > 0) {
133               var minicart; 152               var minicart;
134               minicart = $('.page-header .navigation .minicart-wrapper').detach(); 153               minicart = $('.page-header .navigation .minicart-wrapper').detach();
135               $('.minicart-place').after(minicart); 154               $('.minicart-place').after(minicart);
136               $('.minicart-place').remove(); 155               $('.minicart-place').remove();
137               $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); 156               $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide");
138             } 157             }
139           } 158           }
140         }); 159         });
141     }); 160     });
142 <?php endif; ?> 161 <?php endif; ?>
143 }); 162 });
144 </script> 163 </script>
145 <?php if($this->getConfig('porto_settings/general/smartlayers')): ?> 164 <?php if($this->getConfig('porto_settings/general/smartlayers')): ?>
146 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script> 165 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script>
147 <?php endif; ?> 166 <?php endif; ?>